From 456b23f2c7601cd1a4f2acc37bb89f12531ea93d Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Mon, 12 Dec 2011 03:25:27 +0000 Subject: [PATCH] More groundwork for future PQ changes. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4135 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/defs.h | 2 ++ gpsbabel/gpx.c | 10 ++++++++++ gpsbabel/waypt.c | 3 +++ 3 files changed, 15 insertions(+) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 8949d63b8..9ff118962 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -280,6 +280,8 @@ typedef struct { char* hint; /* all these UTF8, XML entities removed, May be not HTML. */ utf_string desc_short; utf_string desc_long; + int favorite_points; + char* personal_note; } geocache_data ; typedef struct xml_tag { diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c index b5c64c797..96f5963af 100644 --- a/gpsbabel/gpx.c +++ b/gpsbabel/gpx.c @@ -134,6 +134,8 @@ typedef enum { tt_cache_log_type, tt_cache_log_date, tt_cache_placer, + tt_cache_favorite_points, + tt_cache_personal_note, tt_wpt_extensions, @@ -324,6 +326,8 @@ tag_mapping tag_path_map[] = { GEOTAG(tt_cache_desc_short, "short_description"), GEOTAG(tt_cache_desc_long, "long_description"), GEOTAG(tt_cache_placer, "owner"), + GEOTAG(tt_cache_favorite_points, "favorite_points"), + GEOTAG(tt_cache_personal_note, "personal_note"), { tt_cache_log_wpt, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt"}, { tt_cache_log_wpt, 1, "/gpx/wpt/extensions/cache/logs/log/log_wpt"}, { tt_cache_log_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type"}, @@ -1010,6 +1014,12 @@ gpx_end(void* data, const XML_Char* xml_el) } gc_log_date = 0; break; + case tt_cache_favorite_points: + waypt_alloc_gc_data(wpt_tmp)->favorite_points = atoi(cdatastrp); + break; + case tt_cache_personal_note: + waypt_alloc_gc_data(wpt_tmp)->personal_note = xstrdup(cdatastrp); + break; /* * Garmin-waypoint-specific tags. diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c index 24bb8c650..ff83eb3d3 100644 --- a/gpsbabel/waypt.c +++ b/gpsbabel/waypt.c @@ -441,6 +441,9 @@ waypt_free(waypoint *wpt) if (gc_data->hint) { xfree(gc_data->hint); } + if (gc_data->personal_note) { + xfree(gc_data->personal_note); + } xfree(gc_data); } fs_chain_destroy(wpt->fs); -- 2.30.2